Loading States, bug fixes