typos & tiny fixes
put everything back together