Remove comment - people have brains ya know
Various improvements