Add comments

Fixes minor bugs