loading bugs were fixed