fixes some more