Added a loading notification, fixed a couple bugs