some fixes, typos, etc