tweaks and fixing typos