Formatting, adding reset method.
Compiler fix.
Misc fixes and formatting.