Finished up errors