- few changes on build and distribution