fixed some syntax errors, ran tb, seems good