fix first start bugs