make things final and fix copy-paste errors