Updated and removed some errors