change float anf fix bugs