Fixed up some things, and added some files