Fixes many bugs, adds terms, some admin info