more fixes
revisions round 3