now random and some fixes