Fixes#65
-- fixed some stuff
-- fixed other stuff