More comments, fix return val