some cleaning, will need to modify make.config