memory, minor fixes.