Fixed some bugs with singer names