Don't need that comment
Added collector commands and cleaned up code

WARNING: Hasty commit, may contain errors.