Minor cleanups (probably final version of the Buenos code)