Lots of fixes and new stuff

Basically everything I worked on in school today...