Various Changes from Eli's List