fixes #22 last adjustments