remove old Main class
various fixes, all but test1 passing
merge