seperate make
two bugs fixed: offset error and labels calculation error