Clean up repo and one more problem solution added.