bunch of responsive updates from master