more fixes; should work now