Fixes for #146, adding child albums, and other small fixes.