Fixed bugs that happened because of typos...