Fix

Fix wrong image location
Name changes

Changes for more appropriate names
Image updates
remove debugging
Fix
Fix