diff --git a/lib/model.rb b/lib/model.rb
index <HASH>..<HASH> 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -22,6 +22,10 @@ module OpenTox
 			  resource.post(self.to_yaml, :content_type => "application/x-yaml").chomp.to_s
 			end
 
+
+			def self.find_all
+				RestClient.get(@@config[:services]["opentox-model"]).chomp.split("\n")
+			end
 =begin
 			include Owl
 
@@ -49,10 +53,6 @@ module OpenTox
 				lazar
 			end
 
-			def self.find_all
-				RestClient.get(@@config[:services]["opentox-model"]).split("\n")
-			end
-
 			def self.find(uri)
 				yaml = RestClient.get(uri, :accept => "application/x-yaml")
 				OpenTox::Model::Lazar.from_yaml(yaml)
diff --git a/lib/task.rb b/lib/task.rb
index <HASH>..<HASH> 100644
--- a/lib/task.rb
+++ b/lib/task.rb
@@ -105,7 +105,7 @@ module OpenTox
 
 		def wait_for_completion
 			until self.completed? or self.failed?
-				sleep 1
+				sleep 0.1
 			end
 		end
tests for yaml representation working