Fixed strings in buffers, tested and working.