added shape dictionary; removed some drawing code