Added a few nice touches