Fixed bugs/syntaxing, improved loading indicators