improvements targeting better eclipse integration