Better minor list and some fixes.