minor tweaks. about to deep dive into SFunction.... god help me.