Some minor fixes and changes. Added a new constant.