minor updates in prep for moving over to a mod-core architecture