increment version and cleanup some whitespace