Correcting some errors structure, Adding new resolutions
Correcting A LOT OF bugs