Lots of fixes, etc.