Improvements and bug fixing contributions tools