a few fixes...