various changes/tests