fixed some things, loading is more intuitive