Fix#2

Fixed some files