more stuff to fix..