merging previous changes

somehow these didn't make it into the previous commit