Small improvements and setting hash as default.