Added headers, fixed comments