last round of fixes before v0.3

Signed-off-by: Fotis Georgatos <fotis@cern.ch>