clarify some names; allow non-existent shapes to be picked and placed