- another bunch of fixes...