Chinese and Pictures tidy and code improved