fixed bugs that ft found