some minor housekeeping and prep for adding another switch