A few more tweaks and a new requirements file.