chore(update): several fixes