fix returning greater than max
clean up status