Fix assertions, update traits documentation