-Added highlighting
-fixed a few issues with getting/setting cursor position