More finished tweaks