Continued to fix and break things