Brought Loading much closer to compilation
Some cleanup