fixed bugs

but not all