Improvements and re build dist