Fixed some stuff in Notation