Cris branch

Merging unmerged things (that we need)