clean up for status'
more clean up and fixed count/display functions