fixed and added comments for my recent changes