images updated; adding factories and doodads. lots of refactoring