Includes some changes recommended by sanderjo. Also some clean up file so hopefully smaller. Also based off of 14.04