Many tiny tweaks