made concise changes we talked about. still need to test code and orientation