various changes/clean up