Bug fixes and new version scheme

+1 (yeah for spelling!)