Cleanup of server, adding some packages all willy-nilly style