Improvement

Bug fixes