working basic map and corrected database