large merge/large fixes