Increment minor v. number

also some type clean up