merging in changes from DW:master

haven't merged in a while, probably should