more fixes from comments