moved some stuff, changed the way cooldown modifier is handled