Fix grammar in comment
Fix logic for shifting arguments in the get/set control methods