loading bugs fixed