shape checking & scoring fixes