other minor improvements