WIP: Improvements from user suggestions

I think eventually, yes. Bubblegum needs a reasonably major refactor in order to actually be able to use this though...