minor improvements, mostly optical