small changes, prep for splitting repo into 2