Fixed a few bugs, improved make.conf installation