Took out Esquares because we weren't using it

and some other minor changes