- various changes