sync up some of the changes from other branches