Fixed according comments and added annotations