Added support for reading albums, other fixes