code improvements, no experience changes