loading States babay!

and fixed bug

fahkin bug.