missing things and fixes from previous commit