Initial bug fixes.
QQ
Squashed em
Comment maintenance