size tweak
merged master