random smaller fixes