75 Fixes #75

-- fixed some stuff
-- fixed other stuff