fix bugs some