Minor update. Cleaned up a few loose bits and pieces.