Some tweaks and changes