fixed silly typos, refactored names a bit