lots of things
more updating and restructuring