Made changes requested by klickverbot.