Fixes #100

-- fixed some stuff
-- fixed other stuff