Levi final fixes

My fixes I am making for the final turn in.