#56 add a bit of doc and annotations