Sync files

Adjusted some Issue