Commit various bits and pieces after GSGP experiments. Some cleaning up left to do.