bunch of fixes...