Some corrections and a config constant added