removed several wait calls
bugfix