minor tweaks -  may be last update before major re-architecture / refactor
update 2