More changes & cleanup

Runable!