images + some fixes