fixing typos and bugs and things