Added header/source switching and added space after comment autocommand remaps.