Bug fixes and new version scheme

Got it.  +1 from me then