change a lot of stuff for final commit