Bug fix. Context was wrong in some cases.
Tidy.
Tidy.
Fix markup.