Syncing the new OHM repo with old changes. Adding layers and fixing text.
merge to master