Migrated comments to new style and added Aux1 tasks