added some more niceties