Cosmetics

Contains fargo_AMR pull request and some minor changes. I'm just curious how the graph will look like when we merge pull reπuest that is rooted on another pool request :-)