added support for methanol and buffers