- Cleaned up some errors