lots of fixes...