Build 9. Streamlined and cleaned up optim2. ALso fixes to make photoalbum work almost fully.