Added launcher, fixed some bug