Many small tweaks...