extracted some constants into constants.h
merge