Problem 1
Problem 2. Many bug fixes