minor improvements
some validity check
change server