added album class and general cleanup