Minor alterations. Released for beta.