Added commentary and fixed disposals