some fix ups