numerous fixes getting most of the framework working ... -sai