final tweaks plus added randomiser