Lotsa changes

Alot of changes to alot of things