stuff to fix