fixed typos and random bugs