Moved a few things around plus tweaks, changed the behavior of the regeneration timers slightly to be less weird