clean up and more

more!!