Some tweaks and more data