commenting overhaul+*self

Rules