Fixed a bunch of bugs, completed new format