minor bugs & typos