Some overall improvements