Fixed a couple of small bugs
Better optgroups.