More changes from alpha testing