fixes #40
fixes #43 
fixes #58 
fixes #59 
fixes #60