fix bugs done