fixed typos and changed some methods