added vundle; got rid of broken mappings; better buffer handling