Kamila changes merge - various bug fixes and improvements #75

Closed kamilakrych closed 1 year ago