readme update and prep for merge