Added more manual annotations
Separated out different negative example generation algorithms