updated code+wiki to make the tasks more easy to understand