NEW: fixes and features.