Fused all relevant header files into their implementation files. Pointed out some hardcoded constants