Directory updates, added terms, formatting better