Also remove patch for issue that has been fixed upstream, add simple meta section, and minor other cleanups.