Fixed errors in q5 and bonus.