Fixes, clean up, add new database abuse, new header file, etc