fixes, changes, and setting up for database branch