Tweaks thanks to nomanman :)
Changes in random thanks to nomanman :)