Took out debug statements
Fixed problem with dependency handling