Arya: defaults added into constants.h + small memory leak issue is solved