Errors have been fixed
Commit before implementing some final changes