Add more definitions and expand comments.