general pretting up
issue #248