some various changes