get stuff to compile again w changes made a few weeks ago