fixed all issues, final submit