few minor changes, clean up