Fix loading and such
Remove running part.
Misc changes