minor changes to get initial running... still some things to resolve