Fixes various github issues dated 3/10

We should discuss how certain things are refactored in this, such as some of the strange pieces of selectors marked as "discuss this change".