Cleanup & minor fixes.