made some other various changes