fixed all issues hopefully