Fixes #55

-- fixed some stuff
-- fixed other stuff