some more tweakes, button square