removed fixed bugs