WIP: simple things to make life better