Fixes #42
-- fixed some stuff
-- fixed other stuff