Renaming & updating forgotten things
Checking and resolved a lot of fails/bugs