Fixes plus some new concepts.