minor improvements #www