minor cleanup
minor clean up
working some more on the stub