Cleanup + Finally fixed the memory bug.