Minor changes, waits for everything to be loaded