added
refactored a few constants, added comments