Minor bugs, remove old crud, fix color change