Clean up

Corrected the endpoints and the configuration and then starting to lay things out a little more