Added some niceties.