some changes/fixes