- Added a warning message when overwriting data that is a function
- Cleaned up a few things