more fixes, still a few lingering errors