Loading clip bug fix and minor update