added async loading (might not work on deployment), fixed some bugs