several improvements...