lots of improvements server-side