correctly deal with flag values, tidy up whitespace and bump bugfix version