Some additions

Some additions and some sorting. :leaves: