Minor modifications

To match databaseConstruction branch
Compiling and running but I can't get the fucking camera to work!