Added a number of nice things