additional fixex
additional changes