REmove debug output
Add more stats