Updated some little things, combined all files