BUG:  Fixed some minor issues.  Genus is still wrong, though.