Broke some stuff and cleaned up and added other stuff.