Fixes for typos and additions/changes