minor improvements...