Fix config being saved everytime and comments being wiped
Don't fetch the datawatcher twice
Fix a memory leak :(