More enhancements. Still figuring out how to properly map shift hjkl though