Fixed various issues #102

Closed sqz269 closed 1 year ago