fixing minibugs