Fixing minor issues and adding more achievements