Tried to fix bugs

There is still problems with the servant file