Fixed some stuff. There might be a lot of commits...my bad.