#53 more fixes