Adding build files and a few needed tweaks