Finished off most of the errors