Fixed ALL the errors