Fixed errors: Paritipants and main fixes