fixed more NOServer bugs