easier vim buffer navigation
more refactoring / updates