Tweaking of some code and constants.