Fixed minor bugs and cooldown