Improving capability
yet some fixes