fixed bugs

sf