Code clean up and now using inv* pattern.
Updated builds.