safe publication some minor fixes
issue 803
issue 803
issue 803
issue 803
issue 803
issue 803
issue 803
issue 803
issue 803
issue 803
issue 803
issue 803
issue 803
reverted
issue 803
issue 803
issue 803
issue 803
issue 803