Cooldown branch merge. Updated to use time comparisons. Also fixed some minor issues causing errors on startup