Notation and bug fixes