Overhaul

get upstream changes to my local copy