status part updates

DRYs up status
adds tha entry hooks
cleans up code