A few updates to the code and make rules.