improved loading stuff
0.0.7