Comments now fully working

Merge with caution. This one's gonna be dangerous.