uncomment some stuff
Re-order some things