More work on margin notes