adding more fixes and additions