removed control m for windows
fixed buffer sizes