Some tweaks..