various changes/cleanup