few fixes ..