A lot of updates!

It doesn't crash anymore soo