Improved the labels for functions/interfaces that should change soon, so that they are not seen in godoc. Also fixed compatibility issues with the new errors for trajectories.  Finally, fmt'd the code, which I had not done in a while