bring up to date with most recent dev changes