many many more changes to prep for release