Lots more annotations
Update HTML too