Expands error messaging, adds loading indicator, fixes some javascript