remove waiting debug line
fix various errors in server