Fixes and cleanup. Added Airline plug-in.