Bug fixes, revamped image system again. There are still some caching issues that force a reload for images. These will be tracked down eventually.