minor changes, fixes, and updates