fixed BufferReader
fixed command parser