Commented code + tiny report update