Working throught fixes and bugs list.
Merge branch 'master' of github.com:Fishgate/OIMGroup-WP