few fixes...