Added and fixed a lot of things