fixes #459
fixes #456
fixes #463
fixes #461