added more settings and fixed minor issue