Core pr 4

Updated coding style and documentation.
Updated the module to use OG 2.x and fixes side effect of this change.
Fixed bugs :-)
OK.