fixes from letter 4 and 4-1