Fixed a lot of broken code

Sorry for being so long - had lots of school video editing homework