Merge with Omega - More OPS - Fixes.. Blah and more...