Minor changes
Fixed Stack Overflow
Threaded loading