Major code cleanup
updates n stuff