[#303] few fixes and improvements to shape objects