final tweaks before adding system variable code