Removed errors, updated images and basic logic