fixed some bugs in servo