some fixes...