More code tidying, cursor position added
Merge pull request #27 from pokecommunity/master

More code tidying, cursor position added