Add ticket tags
tidy up and add space tags
Add/Remove Debug or minor tweak
Cleanup after the merge.