Fixed image not updating bug
Some more fixes