More fixes and aditions