Lots of changes

Refactored, removed manual screen, added anchor watch.