big help cleanup
comment out names for now, not sure it's a good idea