more fixes and bring ups