many little improvements