Comments, some re-organization, etc.