merge in some changes from master