(again hopefully) merging dwelch's commits into my branch