69

-- Fixes #69
-- fixed some stuff
-- fixed other stuff