Removed debug messages, increased buffer size