version up and some clean up