Restart scheduler every hour, fixed a few minor issues