fixed all issues