Fixes #98
-- fixed some stuff
-- fixed other stuff