final (final?) tweaks