WIP for cleanup
Fixed up some little issues