added serval things, but now its broken