WIP: Improvements from user suggestions

Do we want to push this to bubblegum?