fixed some issues #31

Closed skharel25 closed 2 years ago