Added error checking, more artists etc