fixes #994
fixes #991
fixes #989
fixes #986
fixes #984
fixes #983