More updates to clean it up
More cleanup and fix some errors.