Updates
Small refinements + change the config file a little