increased string buffer to fit path + simplifications