Fix comment errors
Fix dsl errors
Reverting EOL changes.