6

fixed bug with cursor and some code refactoring