fixed bugs, typos