minor improvements all over