WIP: Improvements from user suggestions

and this one?