further updates, backing up before dev VM wipe.