Adjust buffer handling slightly
cleanup file names bump version