fix show-shapes and small other tweaks for new shapes syntax