rev version and add keywords
fix tests