various fixes, changes, and updates