Various additions fixes and more