bugfixes; pretty printing for matter; handbook works again