lots of adv ins fixes