Add some autocommand stuff and modify some commands