-added some settings and options