Fixed some of the errors. TODO fix the rest