committed few fixes