Adds forgotten annotations
Much needed formatting/cleanup of the main file