Forgot two files in previous commit and fixed some errors.