Bug fixes and general improvements #21

Closed jasonking3 closed 2 years ago