fixed errors, typos, working now