Mainly s/unary and minus/unary minus

This is relating to #47.