Fixed some errors!!