I just caught up on this thread Ken. Looks good. I'm glad you moved the bathroom too . Don't forget a good exhaust fan . Make sure the fan is on a separate switch from the lights. Regardless of the rated CFM, "odors" take more time to be removed due to the mixing with fresh air. If you run your locos with a lot of smoke you may want to have exhaust up high in the main area as well.
Love the track plan as well. Looks like a good combination of main line running and switching.
Hope you get to build it sooner not later.
Bob