Express bugfix, added note stuff while I'm at it even though it doesn't
work yet.