added cooldown, some fixes