more tweaks to shapes section