changed some files, added more