minor typos and cleanup