PYKE-549 - comments and stuff.