small changes; pushing so Flip can commit his changes
resolved some merge conflicts