some few fixes