Added a few nice things