Address comments

Address a number of comments from beta2