rework build and launcher