Fixed a whole lot of issues caused by being hurried.