Added a few things to make life better