Comments etc

PTAL @richlee33