Cleaned up and solved new problems