removed main2, mostly fixed maint
merged