make more things final