bump version number
various cosmetic changes

indent, whitespace, cs fixes