more robust about non-fragment annotations
start cleaning up body notation