minor comments to main. Please let Drew know if something went wrong. As of this commit, Drew is switching to a new branch for the wireless killswitch testing.