Cooldowns fixed, minor changes and updates