Better randomisation

fixed randomisation-ish, collision still needs work