some changes, added launcher