Major update

Garbage collection/proper removal and stopping of the watchers. I have
also made a lot of TODO's that should be looked at. A lot of concepts
need some rethinking.