Fixes #85

-- fixed some stuff
-- fixed other stuff