Added and mofiied some more files