Clean up a few configuration settings. Change up watch alias