Fixed a lot of stuff, made async loading so far