some fixes and images