made ultimate fixes