Comment fixes

Fix some issues raised when trying 0.2 on the site