working on udpating to recent rich
rich update
starting fixes