more minor bug fixing