Minor changes to variable and GUI drawing