minor performance and docs tweaks