I shuffled code around so that I could have multiple image directories. Previously it wasn't working right.
Also fixed some sundry bugs.