Bug Fixes and typos