Minor interface changes. Some comments added.