Bug fixes....
Removed debug statements.