September improvements

@bhance Combined the two patches into one branch - looked like there was some interdependence between the two - I think this combined one will be easier to work on together
@bhance are you thinking this is the function that should run every hour? Were you seeing issues with the update queue?