Fixed some errors and added new ones.