Minor changes
Database integration (unfinished)