Added some necessary files etc
Modified some files to be closer to 3.3.6 tag