Clean up and tweaked install and local template file