Remove Small Bugs, Errors. Guard Against Potential Errors.