A few fixes, now to work on performance again.