Comments now fully working

Merge with caution. This one's gonna be dangerous.
You could just check (if .. != null) { ... }