Slight improvements

No substantial changes; mostly just played around a bit with trying to
fix the bug of where image objects appear.