Added marginalia, added a number of actions.