lots of changes, no more server-setup