adding new things from changes

Changes to the new merges. Pls merge and delete.