Added some of the things you wanted