* various changes