fix some more stuff to make it more readable