Continue 1.5 update

34 or so errors remain. A large portion of this update was
@ExterminatorJeff 's doing, but I had to commit it for him.