Various enhancements July 2020

[OAGr]

• Minor refactors for messy Rendering code (getting cleaned up for new version).
• Allows ".*" and ".+" to work as expected, which is kind of neat.