Changed order of entries
Some minor changes