comments fix up wip