Fixed some errors. GETTING THERE