fix bugs and prepare for soft launch