mostly sensor fixes