optimize datapoint generation
ACC always true - bugfix
tidy up