More changes

+ added stuff