database info added
changed some settings
merging