Fixing a few small problems and setting the  version