Fixes#63
-- fixed some stuff
-- fixed other stuff