sync to latest

pull in changes from paul's latest