Several fixes based on user testing in this build to include: