Final bug fixes, name changes, and updates