Finished features for gamma. Refactored to remove references to beta version.