added album import and cosmetic fixes