Updated chapter. Now chapter is organized like lecture
Added some todos