Fix labels and variable names

Increasing buffer size next