Some more changes and images