added discrete notes, other small additions