Moved to BETA state.
Minor fixes.