main bug fixes etc #13

Closed cschin closed 1 year ago