fixes #7 #2 #6