added some more parsing and table generation