Added more comments + little changes