Did many things

Check the commits