fix bugs and prepare for soft launch
merge with pieter