Beta version removed and replaced.

Beta version removed and replaced.
Commit includes a series of fixes.