validation + cleanup - final commit

its all done yay ;)