Removed powerline. Added airline. General fixes.