few fixes, cleaning, ...