merge various things from master