Lots of Fixes + SetupDatabase.php