more fixes on the way