added loading
added loading
added loading
fixed more stuff