next-sgrenier

Misc. cleanup and fixes.