small imperfections fixes