update to lastfm handling, clean up some code clarity