More changes from beta testing