Some tweaks and images