semantics mostly fixed

still need to figure out nav