cleaning some code, updating version