another part of monor fixes