updated images and fixed some bad logic