Added day4
Did some corrections and TODO