move the FakeES, lib updates
whitespace, and lib changes