Bunch of changes.
Realized why annotations were saved the way they were.