Improved prompt, fixed bash completion