Added challeng3 and fixes