numerous changes

cleanup and changes for the tutorial