Fixing #13, mostly