comment updates, filesystem cleanup, and stats cleanup