Added and modified stuff mentioned in last core meeting