Forgot a file.
Fixed minor inconsistencies.