more randomness
various fixes