more fixes, yippee