73

-- Fixes #73
-- fixed some stuff
-- fixed other stuff