Update
Another update
Kind of v2.1b
Kind of fixes and stuff

There are still a lot of to do