some fixes, still stuff to do