Update images
Few more fixes
Test