Bug fix for polygon selection and minor text changes