slew of additions and changes