WIP: Improvements from user suggestions

Indeed