some more stuff to fix