Added more constants and fixed type issues with values read from config file