Added more config options and updated commands