more fixes; first test passes