Got rid of carets (b/c hover) and relinked stuff

And fixed more of Andy's mistakes...