Bug fixes and new version scheme

@clarkperkins good nit-pickiness...  I'm for consistency throughout (whether that's format or %s).