Improve album support

This makes albums embeddable and adds a few other nice improvements.