Commented and added some small things