few fixes, improvements