Cleaned up the experiment and bug fixes.