small tweaks but done