Noted some problems.
Added more comments