Merged cyrus-' changes and initial table generation code.