Fixed a ton of issues, added a ton of tasks to be done