from server, minor things
bug fixes from serve
added affected only