Update readme + some comments