Removed some random cout statements.
merged local version with github