final (?) tweaks