More accurate comments

Fix #299
Fix #292
Fix #304