merging master into branch changes

since it still crashes, i'm leaving this in a branch for now