New adds, fixes, and more changes