--Fixed some errors