Added to the 'TODO' list. I also fixed a comment or two.