Fixes and features.