Cleaned up a little and fixed some errors due to depreciation.