Added constants. Tweaks.