Fix some stuff and add images