fixed all issues except for the automatic check