Minor changes
Updates from beta test