Added randomize animation, other tweaks