Yeah... many changes :)

Don’t know where to start, I changed a ton