various mods -- prep for new machine