Updated comments, some fixes.