added a lot of stuff to everything except server