pull in most recent commits

bring my fork up to date