FEATURE: several improvements  updates.