Fixes #65 #61 #56