New loader and small structure fixes