Some tweaks and updated text