added some files, fixed a bunch of stuff