Wrote some comments; sprinkled some attributes; etc