fixed remaining main occurances, refs #1