fixed minor typos
more updates, cleanup