Fixed Max's problems with image selection, etc.
Eliminating debugger calls