fixes #27,#28,#30,#33