Add a few new conditions, and update the README a bit more