fixes #563
fixes #459
fixes #554, fixes #179