WIP: Improvements from user suggestions