fixed some sa stuff, also tested it at this point